Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Admin api to add an email address #6789

Merged
merged 9 commits into from
Feb 7, 2020
Merged

Admin api to add an email address #6789

merged 9 commits into from
Feb 7, 2020

Conversation

dklimpel
Copy link
Contributor

This implements #6769.

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a [changelog file]
  • Pull request includes a sign off
  • Code style is correct (run the linters)

Signed-off-by: Dirk Klimpel dirk@klimpel.org

anoadragon453
anoadragon453 suggested changes Jan 31, 2020
View reviewed changes
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and is working well.

synapse/rest/admin/users.py Show resolved Hide resolved
tests/rest/admin/test_user.py Outdated Show resolved Hide resolved
anoadragon453
anoadragon453 suggested changes Feb 3, 2020
View reviewed changes
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good other than a very tiny nit.

Also, we had a CI breakage which you seem to have hit. We've fixed it but you'll need to pull the develop branch into your own so that CI is fixed for this PR. Apologies.

synapse/handlers/auth.py Outdated Show resolved Hide resolved
dklimpel and others added 2 commits February 3, 2020 16:34
@dklimpel @anoadragon453
Update synapse/handlers/auth.py
ed187e2 
Co-Authored-By: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>
@dklimpel
Resync Develop Branch
f92a2c9 
Resync Develop Branch
@anoadragon453 anoadragon453 self-assigned this Feb 6, 2020
anoadragon453
anoadragon453 approved these changes Feb 7, 2020
View reviewed changes
Copy link
Member

@anoadragon453 anoadragon453 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@anoadragon453 anoadragon453 merged commit 56ca93e into matrix-org:develop Feb 7, 2020
@dklimpel dklimpel deleted the admin_api_to_add_an_email_address branch February 7, 2020 11:03
babolivier pushed a commit that referenced this pull request Sep 1, 2021
@anoadragon453
Admin api to add an email address (#6789)
3b0ce55 
* commit '56ca93ef5':
  Admin api to add an email address (#6789)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@anoadragon453 anoadragon453 anoadragon453 approved these changes

Assignees

@anoadragon453 anoadragon453

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dklimpel @anoadragon453